Some Minor changes, calendar stuff mostly