a few small adjustments to parser and associated functions