Finally fixed archiving. Plus some other additions and adjustments.