more work on adding waterbodies and editing on waternew.php