Brandon/move collision box

Collision boxes cover most of sprite. Also found a bug with sword, but I fixed it