some parser bugs fixed