Fixed the weird URL stuff
More fixes