a lot of random changes and intregation of config file