simpler redirect and more fixes