wip: cleanup
wip: combobox in progress