FIxups

I rebased this for you and added the new code to the IANA section.