Reworked Combo and a lot of other stuff

Still needs DFG usage