More code cleaning
More cleaning/renaming of stuff
Fixed the graph stuff