in class fixes from hell