Improved settings a bit.