Added Pyramid4Geometry and CylinderGeometry and other fixes