Improved tools. The blocks now invoke the tool, not the other way round.