Finish target import, misc improvements