Adding url callback.
More fixes.