That stinks to hear that its simplified a bit. I was gonna put her in that outfit if I got the singing doll so that's a little disappointing. But to answer your question about Hei Hei, its because his entire character was kind of changed at the last minute. He was supposed to be really stubborn and mean in the original film, but they rewrote him several times to try and figure out how to get him to work. His final version is what you see in the trailer, where he is more comical. Disney probably already had stock art of him done (that is how he was revealed at D23 as well), so they didn't want it to go to waste.