Sort options, enable all by default, better names