I agree that Coffee is paramount.
The Librarian angle evolved to its next stage, which is what everyone wants. That's right, they are now being repackaged as Jehovah's Witnesses.
Luchasaurus dealing with Cima nightmares, like half of the Dragon Gate roster still does to this day. I hear they offer counseling to anyone who can win the Open the Dream Gate belt.
Marko and Sammy both need some counseling of their own.
Oh, and props to Scurll, and ROH, for already making most of the big changes everyone asked them to make for a year. Notice how quickly the good PR is starting to come back?