updates from sam and me

Sam's site plan / some updates to calendar