Updated some global variables in preparation for Calculator Transition