Retrieving ally causes return to home
Minor tweaks
Merge remote-tracking branch 'bone/master'