Fix a few more corner cases
use commander for option parsing