Adventurer hench + bugfixes