fixes, opcode counter added