did more calendar stuff, fixed the dates and all that jazz
merged shit