assorted improvements to tools