Tool drawing improvements

fixes: 42
Merge pull request #46 from agrc/drawing-issue