-some fixes + simple combo system