Improve installer
More installer improvements