More services & small clean ups

I didn't add anything on this one, I was correcting archshift's indent mistakes.