Some fixes and improved IANA text.