Updates to doc and clean up html