Add water level, plus minor cleanup