cleaned stuff and fixed redirects