Bug fixes and edidit support for all weeks