some more parse stuff
merge