A couple of notes/todo.