fixed acitivity issues and made service endpoints private.