Further work improving parsing