extensive edits to URLs throughout