improve todo and some comments