Fixed/improved settings