Added a few todos after Code review.