Fixed bug in water
fix bug with state2
another fix to state2
Update Nterface.au3

Updated for 3.54
Merge remote-tracking branch 'upstream/master'