begin tokenization refactoring
additional tokenization updates; added whitespace test
further tokenization updates