clean-up combobox code and fix some issues