Changes to Nodes

Just setting all the enums well. Should be done now!