Fix list of Annotations (rebased onto develop)



This is the same as gh-496 but rebased onto develop.

----

I noticed some discrepancies when reading the docs. Needs checking by someone familiar with annotations.