Finished suggestions made by Joel, particularlyy in AnnotationSet.py