rename the options, document them and reorder the changelog a bit