More testing and some refinements.