fixed some issues with URLs