add yweek and mweek, fix bugs