redirect issues and minor bug fixes