Minor work on archives and pricing