Some cleanup.
Updated vnodes.
Merge branch 'test' into dev