redirect and form fixes