Moved tools to the new entity system
Various fixes