Update doc and add tooltips