removed todo and a fix