minor bug-fixes for options