Lots of fixes to updates and queries.  Moved Irrigation to Lawn.