* added a number of tools
* fixup