some minor changes to tools