redirect and small tweaks