more parser and tokenizer fixes and additions