Added TODO bug item.
Revised TODO comments after reviewing code.