removed some opcodes, fixed bugs