minor changes based on w3c tests