Added rifle behavior
Updated names, cleaned up some of the physics classes