-Fix: RemoveNode didn't work so well
-Codechange: more stuff
-Codechange: .
-Codechange: more work