Mostly fixed the water/lava column problem (for good)