Group (by day) support and fixes