Added local redirects back and fixed string out of bounds issue