Changed configuration.
Added new options and sections
Added comments