More work on new HTML reader.