added a few more tool definitions
removed whitespaces