More fixes + calendar
Merge branch 'master' of https://github.com/hamlim/ShirleysScheduler