Preparation for HUGE updates (deprecations, wand fabricator, bug fixes)