More installer work

committing so I can move to my laptop for travel