Working on the docs, cleaning up