changes to options setup (won't fail w/o params now)