added regressors for trial type
added outcome regressor; now using all trial types