good progress, now fixing the annotation of all classes