Finish annotation markup, fix zoom throwing out the coordinate calcs
Merge pull request #4 from rogerhutchings/click-fix

Text annotations are still off when the marking surface is moved