-dateAtStartOfWeek fixed, -dateAtEndOfWeek added