fix numbers in address
fix incorrect address computation and two opcodes