Fix URL, cleanup