Formatting fixes and more logical calendar splitup