Cleaning up some things.
More functions for doing self-assignment plots, etc. and more...