Fixed bugs

Added Combo
Added Combo Option
Fixed bugs