Bugs in the dataGenerator and dateTime scale fixed.