Minor changes to increase stability
Changed data folder