TODO lists

fix bugs
 - upstream developments

