Fixes and adding redirect mode.