added stuff to node state and renamed other stuff :)