working version of schedule along with other minor edits