bug fixes and attacker grouping