Bug fixes, annotations on most class files