Optimization fixes
Brushing fixed. Additional datasets.