adding todo and cleaning up debug output