fixes and changes around setvices modiule