Added TODO notes and review comments.