convert to opm-parser

and fix some (likely) bugs...