Fixed couple of minor bugs
Added start of legacy import command