More Arch16 and vocab changes