fixed incorrect handling of imported filenames
additions, fixes, improvements