updated todo and URLs