Mention RFC 2396 as well as UlS-46 update plans

Also: add/fix references, and fix typos