fixed some moments
fixed redirect