Cleaning up some URLs

Hi,

This should fix some odd urls issues.