Some line-wrapping, where easily possible
Improved support for filenames that contain space characters.