Re-work the LostWand mechanism

And update for 1.3.1