@@ -26,17 +26,20 @@ static Uint16 (*pop8)(Stack *s);

 static Uint16 (*pop)(Stack *s);

 static void   (*poke)(Uint8 *m, Uint16 a, Uint16 b);

 static Uint16 (*peek)(Uint8 *m, Uint16 a);

+static void   (*devw)(Device *d, Uint8 a, Uint16 b);

 static Uint16 (*devr)(Device *d, Uint8 a);

 static void   (*warp)(Uxn *u, Uint16 a);

+static void   (*pull)(Uxn *u);

 static void   push8(Stack *s, Uint16 a) { if(s->ptr == 0xff) { s->error = 2; return; } s->dat[s->ptr++] = a; }

 static Uint16  pop8_keep(Stack *s) { if(s->kptr == 0) { s->error = 1; return 0; } return s->dat[--s->kptr]; }

 static Uint16  pop8_nokeep(Stack *s) { if(s->ptr == 0) { s->error = 1; return 0; } return s->dat[--s->ptr]; }

 static void   poke8(Uint8 *m, Uint16 a, Uint16 b) { m[a] = b; }

 static Uint16 peek8(Uint8 *m, Uint16 a) { return m[a]; }

-static void   devw8(Device *d, Uint8 a, Uint8 b) { d->dat[a & 0xf] = b; d->talk(d, a & 0x0f, 1); }

+static void   devw8(Device *d, Uint8 a, Uint16 b) { d->dat[a & 0xf] = b; d->talk(d, a & 0x0f, 1); }

 static Uint16 devr8(Device *d, Uint8 a) { d->talk(d, a & 0x0f, 0); return d->dat[a & 0xf];  }

 static void warp8(Uxn *u, Uint16 a){ u->ram.ptr += (Sint8)a; }

+static void pull8(Uxn *u){ push8(u->src, peek8(u->ram.dat, u->ram.ptr++)); }

 void   poke16(Uint8 *m, Uint16 a, Uint16 b) { poke8(m, a, b >> 8); poke8(m, a + 1, b); }

 Uint16 peek16(Uint8 *m, Uint16 a) { return (peek8(m, a) << 8) + peek8(m, a + 1); }

@@ -45,9 +48,10 @@ static Uint16 pop16(Stack *s) { Uint8 a = pop8(s), b = pop8(s); return a + (b <<

 static void   devw16(Device *d, Uint8 a, Uint16 b) { devw8(d, a, b >> 8); devw8(d, a + 1, b); }

 static Uint16 devr16(Device *d, Uint8 a) { return (devr8(d, a) << 8) + devr8(d, a + 1); }

 static void warp16(Uxn *u, Uint16 a){ u->ram.ptr = a; }

+static void pull16(Uxn *u){ push16(u->src, peek16(u->ram.dat, u->ram.ptr++)); u->ram.ptr++; }

 /* Stack */

-static void op_lit(Uxn *u) { push8(u->src, peek8(u->ram.dat, u->ram.ptr++)); }

+static void op_lit(Uxn *u) { pull(u); }

 static void op_inc(Uxn *u) { Uint16 a = pop(u->src); push(u->src, a + 1); }

 static void op_pop(Uxn *u) { pop(u->src); }

 static void op_dup(Uxn *u) { Uint16 a = pop(u->src); push(u->src, a); push(u->src, a); }

@@ -72,7 +76,7 @@ static void op_str(Uxn *u) { Uint8 a = pop8(u->src); Uint8 b = pop(u->src); poke

 static void op_lda(Uxn *u) { Uint16 a = pop16(u->src); push(u->src, peek(u->ram.dat, a)); }

 static void op_sta(Uxn *u) { Uint16 a = pop16(u->src); Uint16 b = pop(u->src); poke(u->ram.dat, a, b); }

 static void op_dei(Uxn *u) { Uint8 a = pop8(u->src); push(u->src, devr(&u->dev[a >> 4], a)); }

-static void op_deo(Uxn *u) { Uint8 a = pop8(u->src), b = pop8(u->src); devw8(&u->dev[a >> 4], a, b); }

+static void op_deo(Uxn *u) { Uint8 a = pop8(u->src); Uint16 b = pop(u->src); devw(&u->dev[a >> 4], a, b); }

 /* Arithmetic */

 static void op_add(Uxn *u) { Uint16 a = pop(u->src), b = pop(u->src); push(u->src, b + a); }

 static void op_sub(Uxn *u) { Uint16 a = pop(u->src), b = pop(u->src); push(u->src, b - a); }

@@ -82,21 +86,12 @@ static void op_and(Uxn *u) { Uint16 a = pop(u->src), b = pop(u->src); push(u->sr

 static void op_ora(Uxn *u) { Uint16 a = pop(u->src), b = pop(u->src); push(u->src, b | a); }

 static void op_eor(Uxn *u) { Uint16 a = pop(u->src), b = pop(u->src); push(u->src, b ^ a); }

 static void op_sft(Uxn *u) { Uint16 a = pop8(u->src), b = pop(u->src); push(u->src, b >> (a & 0x07) << ((a & 0x70) >> 4)); }

-/* Stack(16-bits) */

-static void op_lit16(Uxn *u) { push16(u->src, peek16(u->ram.dat, u->ram.ptr++)); u->ram.ptr++; }

-/* Memory(16-bits) */

-static void op_deo16(Uxn *u) { Uint8 a = pop8(u->src); Uint16 b = pop16(u->src); devw16(&u->dev[a >> 4], a, b); }

 static void (*ops[])(Uxn *u) = {

 	op_lit, op_inc, op_pop, op_dup, op_nip, op_swp, op_ovr, op_rot,

 	op_equ, op_neq, op_gth, op_lth, op_jmp, op_jnz, op_jsr, op_sth, 

 	op_ldz, op_stz, op_ldr, op_str, op_lda, op_sta, op_dei, op_deo,

 	op_add, op_sub, op_mul, op_div, op_and, op_ora, op_eor, op_sft,

-	/* 16-bit */

-	op_lit16, op_inc, op_pop, op_dup, op_nip, op_swp, op_ovr, op_rot,

-	op_equ, op_neq, op_gth, op_lth, op_jmp, op_jnz, op_jsr, op_sth, 

-	op_ldz, op_stz, op_ldr, op_str, op_lda, op_sta, op_dei, op_deo16, 

-	op_add, op_sub, op_mul, op_div, op_and, op_ora, op_eor, op_sft

 };

 /* clang-format on */

@@ -134,16 +129,20 @@ uxn_eval(Uxn *u, Uint16 vec)

 			peek = peek16;

 			poke = poke16;

 			devr = devr16;

+			devw = devw16;

 			warp = warp16;

+			pull = pull16;

 		} else {

 			pop = pop8;

 			push = push8;

 			peek = peek8;

 			poke = poke8;

 			devr = devr8;

+			devw = devw8;

 			warp = warp8;

+			pull = pull8;

 		}

-		(*ops[(instr & 0x1f) | ((instr & MODE_SHORT) >> 1)])(u);

+		(*ops[instr & 0x1f])(u);

 		if(u->wst.error)

 			return uxn_halt(u, u->wst.error, "Working-stack", instr);

 		if(u->rst.error)