fixed calendar errors, removed unnecessary includes and did minor cleanups.