reference to missing class is a warning now; minor improvements here and there