Mapping - Updated / Fixed errors
OpcodeMap - updated / fixed error