Add some words so tox sphinx passes for me personally.
Some cleanups based on review comments.