more in-class fixes