added  :verts-2d to square topo
tidied up 2d shape generation code