Added options for shuffling data, specifying number of trials and trial length, and separate handling of independent and dependent trial start times