More testing and tweaking.