Installer tweaks, fixes #31, fixes #32