Minor comments and edits to try to get the default selection to work