bug fix: forgotten routines for annotation retrieval
minor optimization
minor cleanup