Importing more graph stuff; fix small mistakes