adjusted option parser