Some bugs fixed in GenerateWorkingData.py