some more small changes to the tools