fixed the bugs brought up to me today, as well as the NPEs
Merge branch 'dev' into dragging_month_events
Merge branch 'dragging_month_events' into dev