some minor adjustments in parser