Simplify some of day model code, switch to correct week numbers. Change up SC time display