fixes to support white spaces in directory names