Options fix and improvement