More fixes for annotation, print out number of annotations