update TODO, fix some issues, add new ones.