more minor tool tweaks