Add ability to include third party URLs in extra_*
Fix whitespace
More whitespace