Bunch of comment fixes and do a better job dealing with funny encodings in domain names