Fixes and stuff

Fixed baton, and rubber bullets again.