Bugfix in data collection; increase in efficiency.