More filling out the docs and minor cleanup.