Typo fixes and more TODO items added.