fixed @annotions for some classes