Fixing a logic issue and shuffling the urls around a bit