Added calendar, other minor