todo.jsm: even more various fixes

NOTE: has been barely tested.