New features in config file + comments and formatting