made a few mor changes to the combobox, cleaned up code.