updates, lots of data collection print statements added