More testing and corrections.