Made some nicer graphs and fixes