tidies for more portable build and better test coverage (services,names), and logging