whirlwind and wind_axe tweaks/fixes