keep attributes out of end tags in tokenizer

other minor stuff