add some more services and cleanup: