added todo and comments