weapons, ammo bonus, some fixes,