Add a TODO.
Comments, 80-col violations.
Unbreak documentation generation.
Bump version.