A few fixes and removal of duplicated stuff, but mostly a bunch of the words on the config file.