Magic

Only new feature is continuous VFX (eg Shield), but quite a few bug fixes and refactoring in there.