Added some more stuff + started to work on the tools