More work on crops as well as generator fix