Cleaned up some stuff and changed configuration file name