update Token class to use symbolic tokens instead of textual; pretty printer updates