2nd round of fixes to rst