Merge pull request #9 from lynx1983/master

less optimizations
fix tools showing while dragging