Minor fixes
New data files