Remove TODOs, improve comments.

Change-Id: I69186a72306450144cbc3631f08c559ae7f78325