Fixing one bug and add more columns about weekly performance