Add some eye candy, new graphs, some structural changes