sort by name fix
dir merge fix (see previous commit oops)