Make comment proper XML form, and correcting URL