added comments + removed combobox