A bunch of fixes; generating data again.