More URL fixes, updated messages.