Some bugfixes, moving settings to serviceconfiguration