updated todo and manual checks