Updated ammo check and cleaned up timer code