Bugfixes and preference adds. See Changelog
Using first day of week preference
Merge branch 'testing'