rework options to prevent inappropriate overrides. fix small bugs