Minor fixes and Adventurer Tweaking