Fixes: Failed date matches and extra classes listed.

1. Fixed cases where dates would fail because there were no weekdays.
2. Fixed cases where extra classes would appear.