* updated todo comments.