Improved click-to-annotate.  Added trace feature