added calendar view, plus a few bugfixes