updated and small fixes so that the 'new' grammar and TypeChecker work together again. ran all tests and they were good