minor fixes

improved results on stress test, should be ready to go