More testing and fixing. Still more to go.