parser: various additions