Revised hitbox and other stuff

Still need to add other hitboxes, but revised the basics of the first
one and fixed some other stuff