Water is now an object, not a tile

Assertion errors concerning water are now fixed.