Completed the expression terminal. Added a variable, variablename, arrayname, functionname and parametername terminals. Formatted/cleaned up some of the code.