Various updates to the service that I needed.