calendar class fixes