Annotation display fixes

Annotations can now have link arrows emerge from them again.

Also fixed a bug in word-wrapping.