Some rearrangement, archive title and description fixes, cruft removal.