various parser fixes