Attempt to fix 1274
Further fixes for 1274

--HG--
extra : source : 092b66d6499ef253f9231e1d7a3fd0c702fc97cc
Options now display, but batches don't print

--HG--
extra : source : 3783d7da901de286d8e68c68941e34d93910c771
basic code working, except for errors

--HG--
extra : source : d99f5c984f5d46f9d52abe8d27377e02bc29e7f6
fixing bad merge
fixing syntax error
Merge pull request #523 from einhverfr/master

Fixing 1274