Several annotation updates.
Merge branch 'master' of github.com:papyri/navigator