minor changes to Wand logic