minor fix on TODO and Docs