Minor changes to script and redirects