added todos
fixed redirect url