Adding TODO and references.

Also fixing some little things.