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

Signed-off-by: Christophe Taton <taton@wibidata.com>