Just some cleanup work

Cleaned up some code, fixed some of the wave... still too difficult to
get to the boss though