Small cleanups, and better docs