Minor changes, improved settings