Merge branch '2021-01-22-tool-updates'

- Assorted updates to the tools/ code