lots of redirect fixes