Fixing hitboxes

There was some inconsistency with hitboxes that should be fixed now