Minor changes to various places.

Clean up in scene.

Fixes to NodeFactory.