Some cleanup, adding calendar events and todos