+ added more parse stuff