removed todo and small fix