Fixed end date calculation and implemented fixes for latest round of clinician feedback.