more parsing fixes