fixes to calendar poc