Align dates with actual weeks and improve descriptions