fixed redirect issues and more