Fix all data files and bugs