Caption improvements