Thank you for the comment. I am not having any problems with captions. The captions stay with the figures just fine.
My problem is that the figure (and caption) do not stay in the proper section of the document when the section moves to another page due to editing in an earlier part of the document. The figure (and caption) stay on the same page even though the related section may move to a page before or after.
Is there a way to have text wrapping and still have the figure stay in the proper section even as section moves from one page to another due to earlier edits?

Thanks