Update documentation

This has dependencies including the cleanup effort over in #1.