fixed some typos and dependencies in tool defs