Made a few simple improvements

Mainly to reduce the number of Redirects