Improved settings etc.