Small fixes and separation of config files