Fixed Edge members and some other mistakes; having problems with map