Added editable settings, comments
Merge complete
Another merge complete