update todo notes
Merge branch 'master' into import_table_models