Config fixes

Renamed a couple of options
Changed some comments