Completely totally fixed it in every single way except for most ways.