overhaul installer
fix up installer