Updates to service, some bugfixes