small parser updates