added ServiceActivity to retrieve list of active services
various cleaning