Update doc and descriptions