ER Calendar Fixes

still a bit of work to do