add some service locator functions
small changes