Cleanup and correct urls