Wrench arrow handling fixed. fixes #99, fixes #98