Fixed controllers, and added new fields to hops/malts