Updated simulator to match archiver; made graph work with new format