more stuff
fixed formulas, but looks worse