Corrected update and draw functions
Some perf tweak in the Tool class