moved more settings into configuration file