Switching week where possible (now). Little bugfixes.