fixing more obscure parser bugs