New tools, bug fixes