Fixes to annotation CRUD and user-annotation association

<3