captions tweaks and add todos