Fix catch trials. Experiment runs correctly
Added catch trials to simple-experiment

Made a few other minor changes