parsing improvements