Performance tweaks, and new test data set
Performance tweaks, and new test data set