Adding some settings, reformatting some of them.