Added bonds support for graph, rewritten generators, some improvements