Add calendar option

bug fixes, better phrasing, calendar option
bugs