! Un-break the installer and tweak a few things

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>