Added several things about weeks, and modified how hours are shown