Add code to get redirected url path
Remove two TODOs
Update settings