Update doc comments and API doc