Directories handled a bit better

but filenames still cut off