copy changes and link fixes