I think I agree with all of your suggestions. Big time on 22.
Apply and Accept in options: I think apply applies your changes and leaves the options screen open where accept applies and closes.