More edits to tools.