Added Factorial code and some minor changes in Parser