some bugfixes and additional services