Week handling and bugfixes.