stress testing, performance fixes