Added events and fixed calendar displays