fixed some formatting
fixed calendar, among other things.