Multiple calendar support
formatting changes
generic calendar page
remove swap files