More water improvements
Fixed water and lava columns, for good I think.
Cleaning up imports