Fixed bugs and TODOs, removed a calendar, refactored code