fix archiving, some misc minor changes