Improves Gatherer section, cleans up some things in Producer section.