Added verification to the options
small optimization
typo fixed
Merge pull request #1 from Selth/master

a couple changes