change in water buildings handling, add some debug output (can crash the game sometimes)