fixed config

some config still badly organized, moved things around, now more overridable from `parameters.yml`