Fixed some bugs in hunter.c

Not done yet, but soon!