incremental improvements, one more section of draft-huitema to edit...
yvrden edits
now it even parses