Added a few more tools.
Merged tools.