Yeah, the green and yellow helicopter who came in through the inside door of the airlock is Gibber. The bigger guy is Counterblast. They were two of the three helicopters that attacked at the end of part 1.

The rotting upholstery is real, yeah, and removing it was the sensible thing to do.