Fixed some data collection mistakes.
Working on plotting the data during collection.