updated todo and features