adding services to apps; cleanup, bugfixes