More comments and to-do notes