Switch urls to hyphens + fix path errors