- fixed update/store data problem
- added handling for edges