Added a "Version" to the Data class that can be changed to force re-generating data
Fixed a bug in data loading