added week_number, modified charts