Did some changes so that useless nodes aren't constructed (I think)