misc updates
updated calendar format