some cleaning up. new test import - working fine so far...