Some improvements to WM
Add some calendars