organized better TODO, and added some formulas to theorems