Cleanup, added special day functionality
Merge branch 'specialsched'