More work on Triangle and TriangleMesh shapes