fixed week offset calc and improved stats display