Fixes #16
Fixes #17
Bounty Hunter & Hired Help now working
v