Combo Editable, and fixed some minor issues