Fixes to WaterModel.

New Frontend project.