a couple of mods on the parser. slow going