More services & small clean ups

Alright