Fixed some typos and added a TODO.