Changed node decorator to deferredNode, and a couple fixlets.