Fixed bug that prevented default options from being used
More fixes to default option handling