more caption fixes