Fixed parser to parse exp;
Improved constant folding