final pass to update instruction encoding; should now match the spec