allowing display of classes, and some other minor fixes