Water 0.2

Water should generate following all rules now.