Bug-fixes in recent changes (new file format and settings for without-5km)