More services & small clean ups

So do you want me to remove all of the doc strings the other services