Multigraph support
Cosmetic improvements