Fixed #4 plus a bug with the 53rd week