Added TODO and fixed some verbiage.