Lots of tweaks for actual installation