Fixed the proper ammo depletion.
Updated the TODOs