improved schedule and time-tracking class