fix urls, cleanup