Hopefully fix some of my dreadful reST...