Better naming, lookup, and added thawing to done.