redirects and minor changes