Fix consolidate files action.
Do some TODOs
Fix import queue saving.