Improved archive.
Fixed nesting.