todo.jsm: various fixes