TODO updates.

I left "optimizations" in; you might want to remove or clarify that point.