Finally handle redirect loops sanely
Improvements!!! Shiny!!