Lots of tweaks that make things actually work in more places