changed config file name
cleanup and config fixes