Added a spider chart, lots of cleaning up