Rewrote installer routine a bit