Typos fixed and a TODO added.