Over storage limit message and bugs