Improvements

Cleaned up the shape hitbox drawing and collisions with shots.