fix env variable
add redirect, other fixes remove password clean up / final version clean up / final version