Minor Changes to Tools (next on my release list)