Mods to plots to account for weekly data, cleaner check for last weekly