fixed more parsing bugs