fix URLs
add link to RFC-23