Simplify options

only pass options to command line that have actually been supplied

please only merge this after #4 and #5.