fixed minor design issues
changed shift end times