CHange a default option; Fix a logic bug