fix imports, optional name when downloading