Bug Fixes

* More fixes to manhunt...