- Added WandGen
- Made minor efficiency improvements