Merged configuration files into one file and fixed a lot of bugs