Fix more opcodes, test 4 passes