Updated names
Added some edges