- Added some TODO's and other form of comments.