Some Testing and fixes from the annotation people

Good luck!