Misc changes - formatting, crop types, etc