more minor-todo notes from James :-)