clean up water forms
connect agriculture to the controller
bug fix