Changing tmp filenames.  Removed diagnostic echoes