More opcodes and removed exception handler