Tweaks and cleanup to tools