some fixes in drama for stage in stage
merged