Added some todo/comments/questions.

Some minor cleanup.