Multiple implementation changes to import script

* Also fixed not handling garbage objects correctly