More water improvements