Minor edits, to include JGraphT

A whole host of bad and/or useless commits.