Add an interlude class. Fix a bug.