Rewrite PropertyContainer/Node/Relationship hierarchy.
Fix wording glitch