[fix] more fixes to the parser