did more fixes than I originally believed.