Tweaking baseurl task
Polishing up...