A few bits of the service implementation added, minor tweaks