Moved config file: some reworks after comments