add forgotten producers, and fix order of modules