Annotation facility has been added, with a little  bug - combination of highlighter and annotator is not wellformed