WIP: refactor of command line and config file settings

Do not merge.