Refactoring
Minor changes
Added a term 'has_changed'
Some work (still to clean up) on Annotation Set update