WIP: more comments and audit tables for annotations