FW: [PATCH 9/9] Fix dir filename /s and resolve many output differences

[Ann & Jason Edmeades]

Please ignore 9/9 and have this as a series of 8 patches... I missed the
fact I added another malloc in 9/9... Since it never arrived this email is
just to complete the series...