Fixed default selection

Updated some strange logic paths, so that users can now provide a 'default' value in the options array.