more improvements to parser