Fix storage duplication and give pickup points storage

Fix storage duplication and give pickup points storage and the ability to make them infinite.