Added watermaker field
Attempted to fix watermaker control