Added word- and formstack functions to tokenizer