pretty important calendar fixes...