Debugged a majority of the expression parsing code