Added some tools, improved the code