Updated Typechecking and Evaluation