Cleaned up classes, killed the bug and player when game won, and some other stuff.
Added another waterblock