Added a couple of potential to-do items.