parser improvments