jsalamero/installer improvements