fixed some redirecting