Update docs, cleanup