I got the stuff in and the figure I thought was Trap Jaw is not, sadly. It may even be Star Wars, I can't tell but it is definitely not Trap Jaw. I did get an extra Attack Trak with two He-Man cockpit figures. Just need another set of treads.
Thanks for telling us where that Evil-Lyn came from! That one was really bothering me.