pick up latest round of changes to fix link order