Added some more to-do notes