More services & small clean ups

What do you mean? I'm doing what was done before with the services