several fixes towards parser reimplementation