More cleanup; finished documentation