Bug Fix

* More logic fixes for Manhunt NPC