Lots of updates, trying to make plots better.