Added rough attack combos, other tweaks