updated todo and docs