Constructed verts and diags
Minor fixeds