Update doc with TODO and new features