Changes incorporating better linking, additional options.