Update for github comments
Add missing settings