pings on enemies
merge ch into master