fix url and cleanup