Fixed: if N and FN both existed, N was picked over FN even if it was empty

This closes #34 and cleans up the import mecanism for names