redirect and other improvements