tweaks and updates to tools