In Genesis 1:7 God divides the waters and creates the firmament, which should not be confused with the common notion of "firm ground". The firmament, ( See Webster's ) means "The vault or arch of the sky," and it created a protective enclosure within the waters of chaos.
Yes, I agree. And I expect that when all the refining gets completed this earth will be returned to its Genesis 1:1 condition.