Updated Default config and comments