And in the process - fix a bug with + and & in file name - fix NewObject returning directories as files