clean up, update docs, tests