slightly fix combos
add support for L1/R1, L2/R2 buttons