added edges, fixed labels