Install script tweaks

This will be it for now, to give you a chance to check, tweak and merge!