Update notes about captions
General cleanup