some changes to tokenize and types