Import finish modified based on the previous modifications
Major bugfixes in import function (issues coming from testing on jul.04)