Merged code added over the weekend for Stage II parsing with the corrections made to the Stage I lexical anylisis.