Name fix; add edge_annotations to owned objects.
Move annotation code to its own module; add tests.