increased ammo functionality with shane. other small changes