better didascalie, and got rid of infamous &apos;

Change-Id: I2cd8a9a542db936cc9f24e37119b31dc3109af96