Added a few to-dos.
Fixed typo.