Finish building the node collection after deserialize.
Fixed some issues with the refactor.
Fixed a lot of small bugs I introduced during refactoring.