Bugfixes, a few data files