some fix + stress testing