bugfixes and services now configurable