some fixes to how combos were being applied and what happened on role switch