Water level

and little fixes