Some minor changes. Callback URL not working