Todo.jsm improvements

from @mcpower