Changed wand updating, greatly improving fps
Removed some old, unused and incorrect code