Added file watching of config file, bug fix