Added some redirects and small changes