Minor tweaks

Tweaks to improve the tools