caption and other fixes