fixing indenting, adding return_url