More services & small clean ups

Along with  the others?