Fixed tools
Improved spanner handling