Limits properly added
Fixed chest empty detection