some changes to redirects and links that make more sense