minor updates and refactoring to tools and logger