Touchups - mostly docs - on new Service/Main code