minor fixes to class 4