Merged Mixed Graph Stuff

Merged some loose ends.