minor tweaks on some attacks