Water: Allow custom initial graph values

Instead of just using 0,0 all the time
Water: Variant 7 - Don't clobber initial defaults
Water: Variant 7 - Better initial graph values