more performance tests and tuning