Improved settings
More fixes to installation order