added more formulas and TODOs