Add better handling for parser options

hmm.. Shouldn't this be 5?