More hitbox changing and cleanups