uses exploit_type vs category, thx egypt
Merge from remote (pr merged via github)