fixed parser to parse formulas properly;
updates in Formula