rst'ify and a few tiny edits