add debug option
catch more edge cases in vim/gvim snafu
cleanup option setting and handling