Fix markup bug.
Add preliminary archive support.