Fixed some redirect bugs, etc with malik