mini fix on 1-01.org and add some TODOs