Some Cleanups, SnapshotWriterQueue now used as suggested, please test it, i had an corrupt archive, but should be due to these changes