minor changes; add a module to combine data files into one