Update doc + minor fixes.