Added addition/division operators, more appropriate parsing capability