fixed rollover and added week check