Fixed all putting & taking of items