Update doc and minor formatting changes.