more calendar bugs fixed