speedy: add G16 back, fix R3 subgroup