Improved settings and docs