Zoom Fix and Ammo Storage

Zoom mode works better, and Storage for ammo works, and variables are
now working better/abstracted better