incremental improvements, pull in some text from draft-huitema