A grab bag of formatting fixes.