Added a couple of to-dos.