Add diagnostic comments, remove blank wiki links