html writer - more improvements.

Down to 5 failures.