Gameplay and hitbox tweeks, final commit of project 4