Cover Annotation and fix stuff.