added some tools, improved the guards a lot