More services & small clean ups
Merge pull request #330 from purpasmart96/new_srv

More services & small clean ups