import: some more 06, cleanups & fwds