tweaks to the data collector; more data collected