Made Shape and sub-classes Nodes. Minor fixes.