updated tokenizer, added renderers