Added config file and implemented tidy ups.