Continued making changes to the parser...