fixing urls and callbacks