Fix Comment
And Added TODO