pull latest into better_fix_magstock_reg