Fixed something
Refactored string prep
More refactorings
Tokenization
Minor clean-up.