-fixes + new combo system