Changed the installer flow; A few fixes.