http/www linkification
Tokenizer optimisation/refactoring
More tokenizer optimisation/refactoring/bugfixes