Fixing incorrect paths
Correcting output variable placement and naming
Removing unnecessary options
Fixing how things are fired