unconditional enabling wizmode + tweaks, refactoring