Fixing TODO issues and added notes for this commit.