sorting is done appropriately (week then day)
added comments