Installer & various small changes