Weeks handling and bugfix.