cleanup
reform AnnotationImpl constructor to use Model
patch datahandler so it updates annotations correctly