Bunch of fixes, plus two silly charts.