added options, untested changes

Signed-off-by: Andy Higgs <andy@higgsdesign.com>