Fixed some import scripts and started on eviction address resolution