further work on annotation change tracking