fix option defaults
more fixes to options